From dfe6399de82a6d93beed5e63e96e4f26fd5bc644 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 18 Jan 2015 16:18:12 -0500 Subject: [PATCH] file chooser: Make ~ and / work in recent Complained about in https://bugzilla.gnome.org/show_bug.cgi?id=743117 --- gtk/gtkfilechooserwidget.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index d18824649d..49780412f9 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -2462,7 +2462,6 @@ operation_mode_set_browse (GtkFileChooserWidget *impl) GtkFileChooserWidgetPrivate *priv = impl->priv; location_bar_update (impl); - gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (priv->search_bar), FALSE); } @@ -2474,7 +2473,6 @@ operation_mode_set_search (GtkFileChooserWidget *impl) g_assert (priv->search_model == NULL); search_setup_widgets (impl); - gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (priv->search_bar), TRUE); } @@ -6895,27 +6893,16 @@ location_set_user_text (GtkFileChooserWidget *impl, static void location_popup_handler (GtkFileChooserWidget *impl, const gchar *path) -{ +{ GtkFileChooserWidgetPrivate *priv = impl->priv; if (priv->operation_mode != OPERATION_MODE_BROWSE) { - GtkWidget *widget_to_focus; - operation_mode_set (impl, OPERATION_MODE_BROWSE); - if (priv->current_folder) change_folder_and_display_error (impl, priv->current_folder, FALSE); - - if (priv->location_mode == LOCATION_MODE_PATH_BAR) - widget_to_focus = priv->browse_files_tree_view; - else - widget_to_focus = priv->location_entry; - - gtk_widget_grab_focus (widget_to_focus); - return; } - + if (priv->action == GTK_FILE_CHOOSER_ACTION_OPEN || priv->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER) { -- 2.30.2